diff --git a/swh/web/common/swh_templatetags.py b/swh/web/common/swh_templatetags.py
index 43ca3941..091121f0 100644
--- a/swh/web/common/swh_templatetags.py
+++ b/swh/web/common/swh_templatetags.py
@@ -1,82 +1,82 @@
 # Copyright (C) 2017  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import re
 
 from docutils.core import publish_parts
 from docutils.writers.html4css1 import Writer, HTMLTranslator
 from inspect import cleandoc
 
 from django import template
 
 register = template.Library()
 
 
 class NoHeaderHTMLTranslator(HTMLTranslator):
     """
     Docutils translator subclass to customize the generation of HTML
     from reST-formatted docstrings
     """
     def __init__(self, document):
         super().__init__(document)
         self.body_prefix = []
         self.body_suffix = []
 
     def visit_bullet_list(self, node):
         self.context.append((self.compact_simple, self.compact_p))
         self.compact_p = None
         self.compact_simple = self.is_compactable(node)
         self.body.append(self.starttag(node, 'ul', CLASS='docstring'))
 
 
 DOCSTRING_WRITER = Writer()
 DOCSTRING_WRITER.translator_class = NoHeaderHTMLTranslator
 
 
 @register.filter
 def safe_docstring_display(docstring):
     """
     Utility function to htmlize reST-formatted documentation in browsable
     api.
     """
     docstring = cleandoc(docstring)
     return publish_parts(docstring, writer=DOCSTRING_WRITER)['html_body']
 
 
 @register.filter
-def urlize_api_links(text):
+def urlize_links_and_mails(text):
     """Utility function for decorating api links in browsable api.
 
     Args:
         text: whose content matching links should be transformed into
         contextual API or Browse html links.
 
     Returns
         The text transformed if any link is found.
         The text as is otherwise.
 
     """
     text = re.sub(r'(/api/[^"<]*/|/browse/.*/|http.*$)',
                   r'<a href="\1">\1</a>',
                   text)
     return re.sub(r'([^ <>"]+@[^ <>"]+)',
                   r'<a href="mailto:\1">\1</a>',
                   text)
 
 
 @register.filter
 def urlize_header_links(text):
     """Utility function for decorating headers links in browsable api.
 
     Args
         text: Text whose content contains Link header value
 
     Returns:
         The text transformed with html link if any link is found.
         The text as is otherwise.
 
     """
     return re.sub(r'<(/api/.*|/browse/.*)>', r'<<a href="\1">\1</a>>',
                   text)
diff --git a/swh/web/templates/apidoc.html b/swh/web/templates/apidoc.html
index 55d9ae11..753eb1a6 100644
--- a/swh/web/templates/apidoc.html
+++ b/swh/web/templates/apidoc.html
@@ -1,149 +1,149 @@
 {% extends "layout.html" %}
 {% load swh_templatetags %}
 {% load static %}
 {% block title %}{{ heading }} &ndash; Software Heritage API {% endblock %}
 {% block header %}
 <script src="{% static 'js/highlightjs/dist/highlight.pack.js' %}"></script>
 <script>
   hljs.initHighlightingOnLoad();
 </script>
 <link rel="stylesheet" href="{% static 'css/highlightjs/github.css' %}">  
 {% endblock %}
 {% block content %}
 <nav class="bread-crumbs">
   <ul>
     <li><a href="/api/">API</a></li>
     <li>/</li>
     <li><a href="/api/1/">endpoints</a></li>
     <li>/</li>
     <li>{{ request.path }}</li>
   </ul>
 </nav>
 
 {% if docstring %}
 <div class="docstring">
   <h2> Description </h2>
   {{ docstring | safe_docstring_display | safe }}
 </div>
 {% endif %}
 {% if response_data  %}
 <div class="response-data">
   <h2>Request</h2>
   <pre><strong>{{ request.method }}</strong> {{ request.build_absolute_uri }}</pre>
   <hr/>
   <h2>Response</h2>
   {% if status_code != 200 %}
   <h3>Status Code</h3>
   <pre class="error">{{ status_code }}</pre>
   {% endif %}
   {% if headers_data %}
   <h3>Headers</h3>
     {% for header_name, header_value in headers_data.items %}
       <pre><strong>{{ header_name }}</strong> {{ header_value | urlize_header_links | safe }}</pre>
     {% endfor %}
   {% endif %}
     <h3>Body</h3>
     <pre>
-      <code class="json">{{ response_data | urlize_api_links | safe }}</code>
+      <code class="json">{{ response_data | urlize_links_and_mails | safe }}</code>
     </pre>
 </div>
 {% endif %}
 <hr/>
 {% if urls and urls|length > 0 %}
 <div class="doc-urls">
   <table class="m-x-auto table">
     <thead>
       <tr>
 	<th>URL</th>
 	<th>Allowed Methods</th>
       </tr>
     </thead>
     <tbody>
       {% for url in urls %}
       <tr>
 	<td>
 	  {{ url.rule }}
 	</td>
 	<td>
 	  {{ url.methods | dictsort:0 | join:', ' }}
 	</td>
       </tr>
       {% endfor %}
     </tbody>
   </table>
 </div>
 <hr/>
 {% endif %}
 {% if args and args|length > 0 %}
 <div class="doc-args">
   <h2> Arguments </h2>
   <dl class="doc-argslist dl-horizontal">
     {% for arg in args %}
     <dt> {{ arg.name }}: {{ arg.type }} </dt>
     <dd> {{ arg.doc | safe_docstring_display | safe }} </dd>
     {% endfor %}
   </dl>
 </div>
 <hr/>
 {% endif %}
 {% if params and params|length > 0 %}
 <div class="doc-params">
   <h2> Parameters </h2>
   <dl class="doc-paramslist dl-horizontal">
     {% for param in params %}
     <dt> {{ param.name }}: {{ param.type }} </dt>
     <dd> {{ param.doc | safe_docstring_display | safe }} </dd>
     {% endfor %}
   </dl>
 </div>
 <hr/>
 {% endif %}
 {% if headers and headers|length > 0 %}
 <div class="doc-headers">
   <h2> Headers </h2>
   <dl class="doc-headers dl-horizontal">
     {% for header in headers %}
     <dt> {{ header.name }}: string </dt>
     <dd> {{ header.doc | safe_docstring_display | safe }} </dd>
     {% endfor %}
   </dl>
 </div>
 <hr/>
 {% endif %}
 {% if returns and returns|length > 0 %}
 <div class="doc-return">
   <h2> Returns </h2>
   <dl class="doc-return dl-horizontal">
     {% for return in returns %}
     <dt> {{ return.type }} </dt>
     <dd> {{ return.doc | safe_docstring_display | safe }} </dd>
     {% endfor %}
   </dl>
 </div>
 <hr/>
 {% endif %}
 {% if excs and excs|length > 0 %}
 <div class="doc-excs">
     <h2> Errors </h2>
     <dl class="doc-excslist dl-horizontal">
         {% for exc in excs %}
         <dt> {{ exc.exc }} </dt>
         <dd> {{ exc.doc | safe_docstring_display | safe }} </dd>
         {% endfor %}
     </dl>
 </div>
 <hr/>
 {% endif %}
 {% if examples and examples|length > 0 %}
 <div class="doc-example">
   <h2> Examples </h2>
   <dl class="doc-example dl-horizontal">
   {% for example in examples %}
     <dd>
       <a href="{{ example }}">{{ example }}</a>
     </dd>
   {% endfor %}
   </dl>
 </div>
 {% endif %}
 {% endblock %}
diff --git a/swh/web/templates/origin.html b/swh/web/templates/origin.html
index 04f029d4..91a73871 100644
--- a/swh/web/templates/origin.html
+++ b/swh/web/templates/origin.html
@@ -1,71 +1,71 @@
 {% extends "layout.html" %}
 {% load static %}
 {% load swh_templatetags %}
 
 {% block title %}Origin information{% endblock %}
 {% block content %}
 
 <!-- Flot plugin dependencies -->
 
 <script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/flot/0.8.3/jquery.flot.min.js"></script>
 <script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/flot/0.8.3/jquery.flot.time.min.js"></script>
 <script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/flot/0.8.3/jquery.flot.selection.min.js"></script>
 <script language="javascript" type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/flot.tooltip/0.9.0/jquery.flot.tooltip.min.js"></script>
 <script language="javascript" type="text/javascript" src="{% static 'js/calendar.js' %}"></script>
 
 <!-- Data result -->
 <h2>Origin information</h2>
 <table class="table">
 {% for key, val in origin.items|dictsort:0 %}
   <tr>
     <td>{{ key }}</td>
-    <td>{{ val | safe | urlize_api_links | safe }}</td>
+    <td>{{ val | safe | urlize_links_and_mails | safe }}</td>
   </tr>
 {% endfor %}
 </table>
 
 <!-- Timeline result -->
 <h2>Origin visit history</h2>
 <h3>Calendar</h3>
 <div class="timeline">
   <div id="swh-calendar-window" style="height: 200px">
     <div id="cal-zoom-window" style="height: 60%"></div>
     <div id="cal-static-window" style="height: 40%"></div>
   </div>
   <button class="btn btn-primary btn-sm pull-right" id="cal-clear">Reset zoom</button>
 </div>
 
 <h3>Visit list</h3>
 <div class="table-responsive">
   <table class="table">
     <thead>
       <tr>
         <th>Visit id</th>
         <th>Visit date</th>
         <th>Visit status</th>
         <th>Browse revision url</th>
       </tr>
     </thead>
     <tbody>
       {% for v in visits %}
       <tr class="swh-origin-visit">
         <td>{{ v.visit }}</td>
         <td>{{ v.date }}</td>
         <td>{{ v.status }}</td>
         <td><a href="{{ v.browse_url }}">{{ v.browse_url }}</a></td>
       </tr>
       {% endfor %}
     <tbody>
   </table>  
 </div>
 
 <!-- Flot calendar setup -->
 <script>
 $(function(){
   var cal = new Calendar('{{ browse_url_base }}', {{ origin_visits_data | safe }}, 
                          {{ origin.id }}, $('#cal-zoom-window'), 
                          $('#cal-static-window'),  $('#cal-clear'));
 });
 </script>
 
 {% endblock %}
diff --git a/swh/web/templates/person.html b/swh/web/templates/person.html
index c13efda1..15c39463 100644
--- a/swh/web/templates/person.html
+++ b/swh/web/templates/person.html
@@ -1,16 +1,16 @@
 {% extends "layout.html" %}
 {% load swh_templatetags %}
 {% block title %}Person{% endblock %}
 {% block content %}
 
 <h2>Person information</h2>
 <table class="table">
   {% for key, val in person.items|dictsort:0 %}
     <tr>
       <td>{{ key }}</td>
-      <td>{{ val | safe | urlize_api_links | escape | safe }}</td>
+      <td>{{ val | safe | urlize_links_and_mails | escape | safe }}</td>
     </tr>
   {% endfor %}
 </table>
 
 {% endblock %}
diff --git a/swh/web/tests/common/test_templatetags.py b/swh/web/tests/common/test_templatetags.py
index 29f36f85..67e5e56f 100644
--- a/swh/web/tests/common/test_templatetags.py
+++ b/swh/web/tests/common/test_templatetags.py
@@ -1,66 +1,66 @@
 # Copyright (C) 2015-2017  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import unittest
 
 from nose.tools import istest
 
 from swh.web.common import swh_templatetags
 
 
 class SWHTemplateTagsTest(unittest.TestCase):
     @istest
     def urlize_api_links_api(self):
         # update api link with html links content with links
         content = '{"url": "/api/1/abc/"}'
         expected_content = ('{"url": "<a href="/api/1/abc/">/api/1/abc/</a>"}')
 
-        self.assertEquals(swh_templatetags.urlize_api_links(content),
+        self.assertEquals(swh_templatetags.urlize_links_and_mails(content),
                           expected_content)
 
     @istest
     def urlize_api_links_browse(self):
         # update /browse link with html links content with links
         content = '{"url": "/browse/def/"}'
         expected_content = ('{"url": "<a href="/browse/def/">'
                             '/browse/def/</a>"}')
-        self.assertEquals(swh_templatetags.urlize_api_links(content),
+        self.assertEquals(swh_templatetags.urlize_links_and_mails(content),
                           expected_content)
 
     @istest
     def urlize_header_links(self):
         # update api link with html links content with links
         content = """</api/1/abc/>; rel="next"
 </api/1/def/>; rel="prev"
 """
         expected_content = """<<a href="/api/1/abc/">/api/1/abc/</a>>; rel="next"
 <<a href="/api/1/def/">/api/1/def/</a>>; rel="prev"
 """
 
         self.assertEquals(swh_templatetags.urlize_header_links(content),
                           expected_content)
 
     @istest
     def safe_docstring_display(self):
         # update api link with html links content with links
         docstring = """This is my list header:
 
         - Here is item 1, with a continuation
           line right here
         - Here is item 2
 
         Here is something that is not part of the list"""
 
         expected_docstring = """<p>This is my list header:</p>
 <ul class="docstring">
 <li>Here is item 1, with a continuation
 line right here</li>
 <li>Here is item 2</li>
 </ul>
 <p>Here is something that is not part of the list</p>
 """
 
         self.assertEquals(swh_templatetags.safe_docstring_display(docstring),
                           expected_docstring)